Merge branch 'upstream'
authorBernd Zeimetz <bernd@bzed.de>
Tue, 22 Jun 2010 21:53:33 +0000 (23:53 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Tue, 22 Jun 2010 21:53:33 +0000 (23:53 +0200)

Trivial merge